From 9c2c5f96a9a9bdcc08c3b654cffff1cbb23c8914 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 3 Oct 2002 23:01:35 +0000 Subject: [PATCH] (fill-paragraph): Give up if there's no paragraph at or after point. --- lisp/textmodes/fill.el | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index 8c5a8d35d1a..0bf4b3e5cef 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el @@ -697,18 +697,20 @@ If `fill-paragraph-function' is nil, return the `fill-prefix' used for filling." ;; Fill prefix used for filling the paragraph. fill-pfx) (save-excursion - (forward-paragraph) - (or (bolp) (newline 1)) - (let ((end (point)) - (beg (progn (backward-paragraph) (point)))) - (goto-char before) - (setq fill-pfx - (if use-hard-newlines - ;; Can't use fill-region-as-paragraph, since this - ;; paragraph may still contain hard newlines. See - ;; fill-region. - (fill-region beg end arg) - (fill-region-as-paragraph beg end arg))))) + (if (not (zerop (forward-paragraph))) + ;; There's no paragraph at or after point: give up. + (setq fill-pfx "") + (or (bolp) (newline 1)) + (let ((end (point)) + (beg (progn (backward-paragraph) (point)))) + (goto-char before) + (setq fill-pfx + (if use-hard-newlines + ;; Can't use fill-region-as-paragraph, since this + ;; paragraph may still contain hard newlines. See + ;; fill-region. + (fill-region beg end arg) + (fill-region-as-paragraph beg end arg)))))) ;; See if point ended up inside the fill-prefix, and if so, move ;; past it. (skip-line-prefix fill-pfx) -- 2.30.2